Hi Eric, thanks *a lot* for implementing this change!
Maybe I missed something in this thread, but what about making the change backward-compatible by allowing "<s" (or variants) to be expanded? For me, I'd rather type <s TAB than `C-c C-x w s'. Thanks for your time & answer! -- Bastien