There are some minor coding style changes.