Update to new CArrayFor construct.