Fixed recursive macro handling; added lots of R5RS macros