More comps fixups
    
    Some stuff like `telnet` is in both `standard` and `gnome-desktop`.
    We currently need to blacklist both.  I think we should massively
    prune comps but...