Of course, I came up with the (relatively simple) fix thanks to having the benefit of Richard Dymond's excellent JSW disassembly, which highlights all entry points to routines in bold.  This feature is of great assistance when carrying out tasks such as shifting and consolidating code.