Simplify ArrayList initialization. Add a TODO.