Enabled support for menu separators.
Changed implementation of collectTerms(...) to preserve order of terms. Before, it would group terms with the same constructor.
Parameterise HashMap.
Hydra doesn't like the diamond
Merge branch 'master' of github.com:metaborg/spoofax