These need to go to the end of the parameter list or it will break backwards-compatibility.