Simplify oracles (#694)

Authored by snowleopard on Sep 30 2018, 6:46 AM.