Yes, the full if-else is clearer, and I'll update this.  It's also refactored out in the pull request that will follow this.