A few code style changes to keep in sync with the mainline code.