Fix some incorrect array access ops.

JVM is stricter. Unbusts the multi-dispatcher somewhat.
Ensure CSD is updated.

Means that the multi-dispatcher sees the args it's meant to.