Enhancements to FileUtils.py and MakoRenderer.py.