Actually fix all of the contract errors in substitute.rkt