Merge "Fix C++ reflection so that -p works."