More refactoring. MC doesn't need know about subreg indices.