Minor cleanup to common processor functionality