improve hygiene on define-macro
defsyntax functon no longer used
cosmetic changes
Merge remote-tracking branch 'refs/remotes/origin/master'