Clean-ups found during review of PR #43

- Moves a repeated import to template level
- Avoids a repeated selection of `symbol` member using a local function