Merge "Replace switch interpreter macros with C++ functions."