simplify/unify c++ extension handling so that seperate macro invocations for each...