Clean up.
Manual merge of changes for Oracle.