Moved code; define FUNCTION?
Merge macro and symbol macro environments
Rename MACROS to ENVIRONMENT

This is in anticipation of being merged with SCOPES to allow for
correct LET/MACROLET interaction.