We've been starting to shift all UAVOs to have these options split out on individual lines, in order to make it easier to add new options. See https://github.com/TauLabs/TauLabs/pull/884/files#diff-1.