Nitpick + (some) unchecked warnings