Merge "Use more appropriate type in cb_handle_t::validate."