now works for 5.3.6 except for ch5/letrec-lang

Replaced many if's with when's
Changed a few require/provide specs to 5.3.6