Pop things off lists sensibly

When removing '' from a list, just remove '' from the list.  Indexing
over lists while you're editing them is a bad idea even when it works,
and at the moment, it doesn't even work.