Tweak to --prefer-explicit logic