Completed batch port to ODataLib. All tests are green.