Type classes sort of
Promoting literal value to type-specific values
Some refactoring, plugging exception holes