Fix the OnBranch shenanigans in resolver