feat: improve `grind` error messages (#6937)

This PR improves `grind` error and trace messages by cleaning up local
declaration names.
21 files changed