Add misc. type annotations

[peterallenwebb]

Description

Improve type annotation coverage.

Checklist

• [x] I have read the contributing guide and understand what's expected of me
• [x] I have signed the CLA
• [x] I have run this code in development and it appears to resolve the stated issue
• [x] I have opened an issue to add/update docs, or docs changes are not required/relevant for this PR
• [x] I have run changie new to create a changelog entry

[peterallenwebb]

Accidentally included unrelated changes.