Update optionals

Also reorder a bit.

Change-Id: I270fb25567f5cefe1ecc732542596c32c5c87ea6