Don't use mixture of cfg.Opt() deprecated args

No need to make this any more ugly than it needs to be :)

Change-Id: Ib7ef13bb5f04e1780565de805eb81413d7b21274
Merge "Don't use mixture of cfg.Opt() deprecated args"