hwdocs/vp1: Missed a few scalar insns.