Minor sytax changes to get it to build with gcc 4.6