Replace debugging with macros.
Normalize numbers.