Small changes to the ValueHandler classes.