Code style fixes.
Remove redundant field initializer.
Improved handling of option values.