Rename container typedef to match contained
Remove obsolete dynamic cast