Unused bindings & whitespaces
Fix test ExtraConstraintsWildcardNotPresent
Remove the obsolete `subst`