More Butterknife refactoring.