Add arglists to public vars