I agree. I'll add it to my personal list of things that need refactoring. Would it be worth making such a list for the team, or adding a note in the code somewhere?