Fix some more cases after merging
commit 31aef3ae.
Some warnings look possibly genuine, others are clearly bogus.