MFC	r264581, r264744 (partial):

Various style(9) fixes and typos in printf and grep.

#define should be followed by a tab.