Are you going more modular, then, to lower the maintenance effort?
I started revamping one of mine into classes with more protected and private functions, and noticed I had some functional redundancy in there, that explained some weird errors I was getting.