Don't need macros any more. Woohoo!