Yeah, I think the two options are continuing down the Rube Goldberg path, but that requires Pants mods to support; so that's a further sign, or working out 1st class support for this sort of scenario.