Use templates to avoid repetition, and to add type safety

Use templates to avoid repetition, and to add type safety #4054