Refactor observer methods to be more consistent.