Xing Xue: Some minor changes for IBM XLC++/AIX.