Cleanup and hide nullFlavor-s.