Tweaks to grammar
Checkpoint progress on row locking

Handle more cases by blocking on other xids.