Allow -X flags to be deprecated, and deprecate RecordPuns; fixes #2320