Fixed variables named "---" not appearing in menus

Transfer of #148.
Fixes #122.