fix a bug in lexical-match and add debug declare forms to main macros.