Applied ArrayShim.

Applied ArrayShim where possible.

Bug: #60