Simplify keeping forked repository in sync with upstream