WARNS=3 and style fixes.  No functionality change.