Rename %DEFINITION to %GLOBAL-FUNCTION
Reintroduce DEFINE-LOCAL
Use DEFINE-LOCAL where applicable