Editor's drafts for minor-tidy-up branch of thomas-fossati/corim-psa