I like the idea of renaming the macros but I do not like adding superfluous "default: break;" to switch statements. To me that just adds clutter.