No more Mr. Nice Guy. If another aikidoka (senior or otherwise) tries to challenge my technique he/she better be up to the same challenge from me (shihan excepted, of course).
It's one of the things I dislike about large seminars - there is always someone who wants to show you their superior understanding so badly that what the Shihan (ie the person you actually paid to see) does is irrelevant. The good news is that partners change frequently enough so it really doesn't matter.
One would think that Shihan have enough teaching experience to not put themselves in such a silly position but at least here he is doing, by definition, exactly what he was demonstrating (just badly).
In both cases, being the wonderfully polite young man that I am, I would just bite my tongue. However, in the Shihan's case he would loose future custom.