stop using collection wrapper functions in templates