Checkpoint interceptor work.
* Fix client concurrency issue demonstrated by Stian's test.
* Partially, a block resource should be marked blocking, but
  even non-blocking resources weren't handled completely correctly
  which has been rectified.