Turned the remaining static enums into dynamic ones.
Fix up the unit tests for the new container type definition.