Moving around some math macros.