Further world.pxd changes (2).