Remove boilerplate in not-a-fork