Further array_lit improvements