Small modifications to the RTTI support.