Removed ugly macros.