Make the table provide usage hints, and line things up more nicely. (cherry picked from commit a948157a6c4e56b8ce7e10e702987f03cd1d13c3)
Make the table provide usage hints, and line things up more nicely. (cherry picked from commit a948157a6c4e56b8ce7e10e702987f03cd1d13c3)