One more attempt to be intelligent about ignoring branches.