Yoast SEO 9.6: Improving our code by Yoast

https://staging.yoast.com/yoast-seo-9-6/