Remove identifiers beginning with an underscore and an uppercase letter (fixes issue #134).
Merge branch 'johannr/fix-issue-134' into next.