Further empty string fixes.