Fix some dead assignments found by CLANG