Refactor support for $null in expressions to stop using ReferenceType
and be simpler