[subset/hvar] minor not super excited about state of the code around, assuming was needed so let's add this may unlikely check also.