Clean up template value passing
Clean up template value passing

Slamdunk/waypointviewer,twpayne/waypointviewer,twpayne/waypointviewer,Slamdunk/waypointviewer,Slamdunk/waypointviewer,twpayne/waypointviewer