Various substitution cleanup.  More examples.