Cleaned up system definition. Import MAKE-KEYWORD from Alexandra.
Merge from github