A few more duplication fixes.