make typechecker conform to spec for #1043, but is this really the right
thing?