Various bug fixes; closer to getting syntax-rules working