Reformatted code with latest formatter, no functional change.