But I tried a lot of other partial solutions in the interim. Strangely enough, I worked that one out yesterday just before noticing the response here...