Issue #21990:  Cleanup unnecessary inner class definition in saxutils.
Issue #21958: Define HAVE_ROUND when building with VS 2013 and above.
Patch by Zachary Turner.