A little cleanup and commenting.  Should be no code changes.
Cleanup of TemplateParameter, first step to refactoring URLs.