Cleanup: use a vector instead of a raw array.