Honour the "key" option even if it would be better on

The keys were being set to be "on" when perhaps they shouldn't
be, this change makes sure we honour the keys option.