Updating: minor.
Updating: more working on ccomp-subst functions.