Promote hasConstr to a top-level definition