5806: Refactor with racket/make