Flatten free-floating lists correctly

This addresses #207.