This includes an upstream fix to the hcldec.Variables function that fixes its behavior when dealing with specs that contain DefaultSpec, and other similar wrapper specs.