Made Lists container-aware

Doesn't change anything yet, but theoretically will head off other bugs.