Minor refactoring.
Recerting last changes.
ValueMapper refactored to UnboundValues<T>.