Agreed. let's be more consistent with our C++ idioms.