More parameter code polishing.