Some smallish fixes to the (rnrs ...) modules.