Simplified, very slightly, some code in the oracle backend