Try harder to demote results from `J#` to `S#` (re #8638)