testing explicitly for the presence of an HQ remote, seems right-er

This seems more like what's intended, and it is certainly more clear no?  This applies to only the first change which I, unfortunately, included in the second.