It would be interesting to see if SR-SWAP is improved when swapping non-terminals is allowed.
it would make feature extraction more complex, because it would no longer be assumed that the buffer contains only tokens.