Opts and Desc separated, no NewMust... incomplete!

Change-Id: I87c8023e17d0b0b1abc62b7e557a5bd7137c5c1c