Make everything use more generic list functions