This seems like an improvement.  But if we do this, we should also change the CRF class.