Also show actual expression in message when possible. Fixes #2599. R=ken2 CC=golang-dev https://golang.org/cl/5654059