Some cleanup on the parameter labeling.