More work on nullable type support