Minor refactors of core/observe