I've learned to just become aware of it, and be present with it, no arguing or yelling or emotion at all. I am not afraid or bugged by it anymore, it's more just 'meh, you again'.
It sounds like you are doing just great at this stuff, DoubleBarrel. Well done.