Get rid of some #defines