Optimization: Unneeded collection creation eliminated