General post-merge-party cleanup (closes #955)