Clean up collections

Use interfaces instead of concrete implementations where appropriate.
Use the Java 7 <> operator.
Avoid Lists.newArrayList() if new ArrayList<>() is sufficient.

Change-Id: I70ebe6ebc7c79f8d742fdd71fc6419461a7aaa65
Signed-off-by: Stephen Kitt <skitt@redhat.com>