- set destructors to catalog_hash_ops, - acquire OrderedHashmap when necessary, - gracefully handle NULL catalog directories and output stream, - rename function output arguments, - add many many assertions, - use RET_GATHER().