Talk:VPBE/@comment-24385282-20160727183217

I'd prefer they just rework, but those changes look good still.