I ended up rebasing my patch on top of Kato Tomoyuki's. Hopefully we can proceed using this strategy. -- Sean M. Collins