ZVISION: Fix out of bounds access.
ZVISION: Small cleanup.