Strings-in-switch, diamond operator and a few other minor fixes.