Some clean-ups

[matttbe]

Here are a bunch of different clean-ups I did while working on #304, mostly helped by clangd.

[coveralls]

Pull Request Test Coverage Report for Build 11531089066

Details

• 2 of 2 (100.0%) changed or added relevant lines in 1 file are covered.
• No unchanged relevant lines lost coverage.
• Overall coverage remained the same at 64.799%

---

Totals
Change from base Build 11503089273:	0.0%
Covered Lines:	1399
Relevant Lines:	2159

---

💛 - Coveralls