- improve previous commit
- improve previous commit

jeff-hykin/better-cpp-syntax,jeff-hykin/better-cpp-syntax,jeff-hykin/better-cpp-syntax,jeff-hykin/better-cpp-syntax,jeff-hykin/better-cpp-syntax,jeff-hykin/better-cpp-syntax