Hmm. The bug has returned without any obvious cause, and using my previous "solution". This is really weird. I've spent days of work on this now.