Reformatted based on new formatting scheme.  No (intentional) functional changes.