hwdocs/vp1: Minor cleanups.