I'm not sure the mixed metaphors are a problem. Cherry picking and pulling from upstream both make sense, and understanding one doesn't interfere with the other. I also doubt there's any set of metaphors you could come up with that would have the kind of consistency required by the author. I am typing this in a box on a page in a window on a desktop on a notebook, and it doesn't seem to bother me.