Improve SQL serialization in Oracle #552