Looks good, this should go upstream.