Minor cleanup

_CompOptionValue is obsolete