Should HiddenServiceNonAnonymousMode change default SocksPort to 0?

If a user enables single onion services using:

HiddenServiceSingleHopMode 1
HiddenServiceNonAnonymousMode 1

The immediately see:

Oct 28 13:28:46.087 [warn] Failed to parse/validate config: HiddenServiceNonAnonymousMode is incompatible with using Tor as an anonymous client. Please set Socks/Trans/NATD/DNSPort to 0, or HiddenServiceNonAnonymousMode to 0, or use the non-anonymous Tor2webMode.

I think it would be better if we automatically disabled the socks port in this case.