Okay, that sounds fine to me. I will fix this up and push the new commits into this PR. That likely won't happen tonight, though.