Redirection parsing - fixes #2