Good call noting this, and it's simpler than refactoring.