I'd like to have that optimization handled in a separate bug.