Ensure we're using an array everywhere.