Refactoring

Again, removed unnecessary collection wrapper classes and replaced
simply with IEnumerables.