if (foo != null) is a code smell

...per Joel we should replace these instances with lists and just let the lists be empty when applicable.