Minor refactoring
This tag has no release notes.