Fixes for classref consistency.
Merge pull request #294 from maximal/patch-1

Fixes for classref consistency.