Better handling of null/undefined expressions.