okay. 

should I fix other offending lines as I see them throughout the code base? there are a number of them in the TD* stuff.