(perf) Avoid creating extra Constraints in Gen & Generate methods

[hyperpape]

This is certainly not something that has a big impact, but it seems "free".

[hcoles]

Thanks, I doubt it has any measurable impact, but as you say there's no down side.