Just one last little tweak to clean up umpteen rebases.