That certainly is looking good. I'm going to prepare a follow-up PR tomorrow with this change and one other small thing I noticed.