I will send you a PR that simplifies this.