Remove superfluous swap mapping, use Vp instead.
Fix up folding and adds gdefault for substitutions.