Migrated to simpler model.
Fixed dependencies of ItemsControl from refactor.  Fixed unit tests.
Fixed null ref bug for container disposal.