Remove literal lists for now.
Make arguments to macros have lexical scope.