Clean up rebase mistakes found by @jschneier