Fix handling of '' and "".