OK, thanks. Once this gets merged in and we won't conflict, I'll do a PR and rip out the tildes (unless @zaach or @nchapman object).