master
tidy-up: mostly whitespace nits
tidy-up: use more `static`, `sizeof()`, `char[]`, double-const