Earlier relaxation of type constraints broke tests: undo relaxation