ReMat: fix overly cavalier attitude to sub-register indices