Reordered __init__ arguments to keep backwards compatibility.