Fix code style according to comments from Edward Welbourne.