WYCS: added support for inlining predicates properly.
WYCS: minor bug fixes for ConstraintInline.substitute().