Better state the intent of dealing with nested types
Fix handling of null base types