Assorted cleanups

A bunch of minor housekeeping when I configured/built on my laptop.