Part 18: Cleanups. Consistency.

You're using Arrays.asList and Lists.newArrayList in a couple of place. We may want to be consistent with that.