Comment 2 for bug 1708291

I pushed a small follow-up patch from Jason to the top of the working branch. There may be a couple more coming, but they won't materially affect the functionality, and it can be considered stable for anybody reviewing it.