Continued refactoring of observer calls