Worked around cpplint recursion bugs in a bunch of geo code.

It all mysteriously was scoped_keyvalue_pair_t && that tripped IsRValueType recursion.
Merge branch 'next' into sam_cpplint_recursive
Merge branch 'sam_cpplint_recursive' into next