Remove two more unnecessary default arguments