Move more from zen container and zen stdcontainer to the template system, still not mainline
Add a comment so I don't forget a small detail