[CB-3827] fix a handful of residual xrefs