These are fairly obscure cases, but let's keep Coverity happy.

Michael Paquier with some further fixes by me.