Uniting cognitive process theory and differential psychology: Back home from the wars