Change to using 'null' instead of empty string where appropriate.

[chris-muller]

This change could introduce a few bugs so it will require thorough testing on a different branch.