Fixes, death refactor.

I realize you've really only relocated messages but macros causes tears.