Pushing non-functional breaking changes (work in progress).