>Ok, are you interested in solving the problem in general?

I don't know relations between this case and general. But my experience in refactoring old-style code says to me to do as I do.