Yeah.  In retrospect the way I've sent this pull request is very confusing. I will resend it as one commit.