Switch some list -> vector for consistency.