Simplify VariableDict
Cleanup.
Minor cleanup.
Allow skipping certain templates.