Use a more readable regexp and fix comment.

refs #319