Porting from xs64bit to trunk.