Does this need to be optional, or is there some way we can include it in the constructor params (defaulted to false) and make it `final`? Otherwise, at least explicitly set it to `false` here?