Further world.pxd changes.