Base-building: tests, types, and tidy commits.