Re #9018. Missed a bunch of references.