pushed a new version using _optional_.
I realize now we could have kept the existing, but at some point we'd need to apply this so I'd prefer to integrate it than to push it back to a TODO pile.