chore: implement fixes suggested by static analysis

These are potentially blocking the basic QR parsing and versioning features from landing.

See-Also: !57 (merged) See-Also: !58 (merged)