Fix conversion to new options framework
Reported by: John Marino Approved by: portmgr (implicit) With hat: portmgr