Merge "Catch classes inheriting from themselves in the class linker." into nyc-dev