Fix check for option values.
Use delegation instead of inheritance.