Added support for substitution, and developed separation algebras for
maps.