Some Racket implementation cleanup