I'll look at possibly adding that optimization. I'll probably do that in a separate PR though so we can push this ASAP.