Converted remaining container classes to templates.