Additions to support checker3.