Yeah, this looks better and should address issue mentioned in the previous commit. I'm just not sure about the variable name.

Maybe `host_argument_set` would be better, since `host_set` reminds me of a set of hosts (servers) :) Besides that, I would also make variable "private" (prefix it with an underscore).