Parsing appears to work now!

Ensure that canonicalise operates on nested Globs within choices
rather than just the top level Glob