NXP-13519: Modify the input or output of the collection operations.
NXP-13519: Clean up unused imports.