(1) Making optional types unions of the real type and null.
(2) Updating unit test accordingly.