Make macros a bit more private