Adding @SafeVarargs where appropriate