Redirection parsing improved