Address linting notes

[ajnelson-nist]

This patch series addresses a few items reported when running make lint and make type-check.

[ashleysommer]

Thanks, I thought I caught all of these before I pushed the last release, but must've missed some.