I think I'll take the change out of this branch and submit something similar as a separate pull request.