Patches pushed as c0d672853a005fc625169f5c905d4562b9b33635 and following with some modifications. I also moved should-test to "lisp-check.scm" as it is a test framework. There are test frameworks that are still in "lisp-xyz.scm", but we'll move them to "lisp-check.scm" too eventually. Thanks.