Fixed a bug with list comprehension not matching against container names.
Refactored a bunch.