Added definition of (SETF MACRO-FUNCTION) using new environment protocol.
Removed component that is no longer needed.