Fix warnings about dangling elses.