Fixes in r7rs.scm and example