CHK handling is back where it was, but the implementation is simpler now.