Fix re-entrancy issue.
Remove extra newline.
Fix whitespace issue.
Simplify integer value enumeration.
Remove expansion order.
Move common value enumerator logic into solver.
Simplify value enumerator implementations.
Move value enumerators into variable classes.