minor cleanigs to avoid warnings from the clang static analyzer

(just some dead-store warnings anyway)