* Simplify code, move option massaging code into own function.
* Process suboptions recursively.
(cherry picked from commit 4393940a41)
* Simplify code, move option massaging code into own function.
* Process suboptions recursively.
(cherry picked from commit 4393940a41)