Misc. Cleanups

Reviews: @vinniefalco, @rec
Forget I said that.  All the other cases are unambiguously better.  Let's just get rid of that macro and not worry about it.