Fix injectivity issues for GADT constraints