doh, only one of the commits was meant to be included on the PR. I'll fix this