Use long options in two other places as well.