Minor refactoring related to KVO