General cleanup, including eliminating a possible redirection through 0 error.