Fix trailing if since can't fit on one line, here and elsewhere.