#2900 -- parameter-less catch clause.

Plus some minor cleanup after f8c6b494aaa3ace561ffc3fe97e5b385aeb22003
Merge pull request #2924 from marchaefner/master

Parameter-less catch clause.