1.0.12.3: less weakening of type-checks