Added wocri flag to make_raw to remove self-clutter from raw acfs.