Cleanup: use a struct/pair rather than two separate lists.