Simplify.
More HIDDEN hardcoding.
Add the definition.
Constant strings.
Dump whitespace.
More work on choice terms.