clang compiler warnings: Fix -Wself-assign