Merge "Fix problems where we were allocating TypedArray when not needed."