I've been bugged for years about 'waiting on'.

I am not waiting on John. I am waiting for him. It would be very uncomfortable for both of us if I was waiting ON him!