It'd be good to merge this PR soon, but I'd still like others to weight in (I'm still very much on the fence).  @xaviershay?  @samphippen? @soulcutter?