And actually roll out the arity change in #dir_name _completely_.