31 commits of barely-visible updates and refinements