cosmetic changes to reduce differences with SVN upstream