Paging @adriaanm; I can't find a clean way out of this straightjacket. Let's discuss this one tomorrow...