The comment in findvar about extract_*_integer looked wrong to me, with respect to target vs. host. If I'm right, this is an improvement, but if I'm confused, then so are these comments. ;-/