Item12952: clean up and document CHECK options