Done. I assume it's okay where it's a parameter? e.g. Optional.of(this._value)?