Get rid of some silly, unneeded macro defs