More work on datomic-util