More polish on the OptionT.