QPID-4677: fix for r1463064, which was apparently too complex for the Eclipse refactor command to do fully the first time or me to notice it didnt ;)