I'd split the hg change into a separate commit.