Merge export

Importing some small changes from ch_util.  Having crazy trouble getting subtree to merge cleanly.