Add macros; remove old conversions