Cleaning up remaining action definitions, switching to macros everywhere