At request I'm reposting here my changes to cmuscheme as context diffs.