Cleanup some dead assignements reported by scan-build

No functionnal change.