Tidy up macro definitions