Add array items highlight, remove arrayItemTerminator hack.