Refactored ignoring host groups.

Bit better of an impl, and can push this upstream (most likely)