Add sanity checking to declaring class visiting
am: b33b1dc

* commit 'b33b1dc78d178060ff0f4327d448fd3a89df51de':
  Add sanity checking to declaring class visiting