Reintroduced the notations, but added definitions that are just aliases.
The notations should only be used in matches, but they also make the
goal viewer significantly easier to read.
Merge branch 'master' of ssh://git@github.com/jesper-bengtson/MirrorCharge.git