Remove the OUTER preprocessor macro metaprograms

Usage of these has been replaced by the more flexible C++11 variadic templates, which also compile faster.