This includes updates to various diagnostic messages to improve precision and consistency of terminology. It also includes some other changes to portions of HCL API that Terraform isn't yet using.