Fix handling of '' and "".
3 files changed