(#21961) streamlined option hash content validity checking