Got rid of some macros and fixed some lint.

YAY. Gonna bike to CHS now.