Modified validators to return value wrapped with type tag.