Fix some static analyzer quibbles