I always try to stay in the pocket when another keyboard(organ, piano,etc)is playing with me. Then he knows exactly what I am going to do. He can then supply the extras if so desired. We usually won't clash at all. If I sense that he is staying in the pocket, then I will embellish, but I don't like to(not so good at that). By staying in the pocket, I mean that I play the song straight up.
If I am staying in the pocket with the bass, I am usually playing within the scale pattern that I have chosen and playing a set rhythm.