(chore) Assorted nitpick fixes.