refactoring (?) syntax-rules expand