Constrain type parameters before reification
Merge branch 'master' into mammoth