Moved around sub-tensor accessors to be a little more linear and explanatory.