Remove calls to String.isEmpty()