Work on #148, substitution confirmation.  It's *almost*
fully-functional.