Reformatted based on new code style.  No functional change.