Clean up: Convert some arrays to lists.