Rebase to Jed's branch.