Make HINT more consistent with extant HINTs