diamond operators and multi-catch code beautification