Minor refactor pass.