So, then you removed some of the Wagn specific stuff from SmartName

IMHO, the standard should be to have a newline at the end of the last line.  In most editors, you have to go out of your way to save a text file without a final newline.  It is better for working with others, right?