Hmm.  Must have missed those bits in the style guide.  I'll get those fixed ASAP.  As to line 540, I didn't write that one.  :)  I'll clean it up while I'm in there anyway, though.