Yes, I think it should be fine, and we can just do `|| []` so we won't even need the `if` statement at all.  Hopefully that will simplify the change a bit.