Simple refactoring to 2 dimensional arrays, in preparation for 128 wide superblocks. Change-Id: I40d447bd9fbd4f755534ea3cc82fc8f4676cea07