Minor clean up to start using Arrays.copyOf() (since we require Java 1.6)