Substitute: quick fix.

Map options and commands a single level deep to that child options and
commands are also included in the substitution object.

Really this needs to be done recursively with sensible prefixes.
0.8.130