Issue #113: Cleanup some typos, unneeded party (cherry-picked).