full_negotiation is an override, not just a flag

If the caller supplies full_negotiation=False, it makes sense if this
forces the shortcut method.