Would you mind cleaning these up?  I know they originally came from my commit, sorry.