Remove is_us_military and is_transparent_proxy, add is_satellite_provider
Tidied and removed hanging space