Cleanup...
Performance improvements on immutable arrays.