Code cleanups

A few very light cleanups to top-level. Pushed for now. More coming tomorrow.