Continued refactoring around the new PageData.py class for more sophisticated template variable management.