Refactor of fix for Ticket 22232

This is a refactor of NathanRSmith's fix for ticket #22232
Leave `get_template()` out of the `with` statement?