Done. I didn't feel super strongly about this, but it's a slight simplification and it exposed a bug in what I had, so thanks.