Merge "Reduce @SuppressWarnings("unchecked") a bit"