1.0.12.35: more safety -- less weakening of type checks