* improvements for handling nullable types.