I would just add the generics, if you feel it is necessary. If the Maps and Lists are all internal and still work fine, just do @SuppressWarnings and forget about it. If they are public and part of...