The name of the value handlers is now clearer.