am 57c0f3f3: Merge "Clean up class visitors"

* commit '57c0f3f3ea153d008a8e8ac32b66cceee682d412':
  Clean up class visitors