Integrating Motivational Traits into the Approach-Avoidance Distinction