I agree. Just play it straight. The more you cut out the funny stuff, the less he'll expect it and look for it, so his signals will change. You can create feedback either way, so decide what you want and then stick to it.