Add final remaining bits to fix #7978.