Merge branch '2021-07-28-build-improvements'

- Assorted Makefile cleanups
- A few code / build cleanups