Start adding rules from R7RS grammar
Clean up a few rules