Created by: sqs
See individual commits. There is no user-facing behavior change as a result of these changes.