Fix xdie typo, clean up nopw.