Added convenience method to CounterOracle, fixed formatting in SULOracle, minor cleanup in MasterQuery