Simplify scheduling of mock observers.

Closes #567 

@loganj @edenman