(The above is mainly a flag up for @msimet in the hope she might join me in thinking about it, when the chance arises... I need to look back at the code and convince myself.)