Integration of zero-centered storage has broken a simplification step central to SRT/TRT methods. This MR fixes it.