Support numeric substitutions with type in tact.
Make sure that nested subs work like that too.
Expand the way subsitutions are constructed.