It makes it easier to diagnose what the generated units actually do. (cherry picked from commit d53285d5) (cherry picked from commit e820d11a)