Refactored constraint solvers.
Prepared simple types example for use with macro-based constraint generation.