Simplify scheduling of mock observers.
Merge pull request #578 from square/jw/mock-scheduling

Simplify scheduling of mock observers.