This has crept back in with the rebase...

Other than that, this looks good.