Kudos for for still addressing this after all this time. Too bad it happend in a stage I no longer actively use my N900.
And sorry for the headaches the refactoring caused (also on behalf of CepiPerez I guess)