Migrate functions to NonEmpty