exclaimation marks are painful

replaces #6398