Make constraints on expression constructors a bit tighter