I'm normally all for the Option pattern, but in this case you are probably incurring more object allocations that we want to in the critical path of query execution.  I'd just use an `if` here.