Nobody likes a bad substitute...

This releases only user-facing change is that on test failures substitution names and values are displayed to ease debugging specs that use substitutions.

In addition this release makes a few simplifications and clarifications to the code base and removes some crufty code.