OK, it's taken a little while, but I tried Graeme's solution macro, and yes, it works. It takes a little getting used to, since a context menu opens when pressing F10, and a file needs to be open for it to work, but it works as described, and solves my immediate problem with SE17, thanks!
I'll give SE17 a new chance now, but I'm eagerly awaiting 17.0.1...