@ohadlevy what do you think of the approach in 4627ff7?  (thanks to @GregSutcliffe for the idea)