Add more descriptive methods to Option.Builder, adapt unit tests.