Starting to remove some of the old block-based observer mechanism.