Clean up macro_rules for former #defines