Minor cleanup of redirection functions