am d22cbfa8: am 57c0f3f3: Merge "Clean up class visitors"

* commit 'd22cbfa80e8cbef6f58a43779537ad12cea200f3':
  Clean up class visitors