Fix merge
Fix merge

An incompatibility between #440 and #438 was not caught until after
merging both to the main branch.

hashicorp/hcl,strivecast/hcl,hashicorp/hcl,hashicorp/hcl,strivecast/hcl,strivecast/hcl,strivecast/hcl,hashicorp/hcl,strivecast/hcl,hashicorp/hcl