Ha, that's what I get for writing two PRs at the same time.