Better handling of non-spoonerizable cases