You could make a deal with him. Ask him if there's anything you do that gets on his nerves. If he can come up with something you could easily change, tell him you'll do so in exchange for him saying things in a less irritating way.
I realize you shouldn't have to do this, but it might be an...