Removed a few more uses of String::empty.