Code cleanup: Convert arrays to collections.