Merge "Fix a static-analyzer warning."