Be *even more* consistent with use of config rather than options