restoring castclass eliding tests
removing dead code
fixing unaligned prefixes