Make this compile with gcc40: rename variables so that they don't collide