Change definition of additionalConstraints function

Allows us to prevent the generation of unneccessary forall quantifiers.