Updating the freespace lists to make more sense (no functional changes)