Please don't undo the migration to the diamond operator. :-)