It's likely I'm missing something, though - it's difficult in a pull request to get all the context. I'm thinking it'd be best if I create a branch for this so we can pull in what you've got. I'll send you a separate email on this.