Opts and Desc separated, no MustNew except MustNewConstMetric.

Change-Id: Ia64ef0fc5181f27c9b0ca034a5f7ef8deb78b70a