adjustments to convert to Racket-backed bootstrap