Yes, that would have been better.

I believe @jvazquez-r7 and @mandreko are going to revisit this anyway, so we can keep an eye out for the next version of this.