Tidy up type constraints