Add SilentSubstitutionToolbox, and minor clean up.

Signed-off-by: David Brainard <brainard@psych.upenn.edu>