Reformatted code based on latest style file.  No (intentional) functional changes.