Fixed a bug where we could end up with lists of nulls.

This also means I can now install firespitter. :)