Stephane's got some changes/additions/and a fix for this in the fork on the reactor github org. So I'm going to close this one and open one from there.