There's my lovely transpose, disregard earlier comment, as I assume that code is going away.