Hey Reynold, ya I just added that in a follow-on commit since it's a closely related change to this one. This fixes SPARK-870 now.