updated for syntax-case