Sonar lint cleanup (Arrays.copyOf(), singleton fields).