Major improvement to SpecConstr