Haack fixups

Some really really minor cleanups. I plan to do more, but I have to make dinner. :)