Fix Coverity 700588.
Fix Coverity 700410.
Fix Coverity 746871 (remove a no-longer-used field) and 746794.