Created by: efritz
Reviewers: Please review by-commit to make all changes trivial.
This PR should be behavior-preserving. Existing unit and integration test suites should catch errors.