Merge pull request #6464 from SvenDowideit/pr_out_exclaimation_marks_cause_shell_pain_simplify_it_away

exclaimation marks cause shell pain - simplify it away