diff --git a/src/main/java/com/google/devtools/build/lib/analysis/RuleContext.java b/src/main/java/com/google/devtools/build/lib/analysis/RuleContext.java
index 65b7a9e..4f80a32 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/RuleContext.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/RuleContext.java
@@ -1493,7 +1493,7 @@
       target
           .getAssociatedRule()
           .getRuleClassObject()
-          .checkAttributesNonEmpty(target.getAssociatedRule(), reporter, attributes);
+          .checkAttributesNonEmpty(reporter, attributes);
     }
 
     public Builder setVisibility(NestedSet<PackageGroupContents> visibility) {
diff --git a/src/main/java/com/google/devtools/build/lib/packages/RuleClass.java b/src/main/java/com/google/devtools/build/lib/packages/RuleClass.java
index cb6b2b6..72d5401 100644
--- a/src/main/java/com/google/devtools/build/lib/packages/RuleClass.java
+++ b/src/main/java/com/google/devtools/build/lib/packages/RuleClass.java
@@ -1984,7 +1984,7 @@
   }
 
   public void checkAttributesNonEmpty(
-      Rule rule, RuleErrorConsumer ruleErrorConsumer, AttributeMap attributes) {
+      RuleErrorConsumer ruleErrorConsumer, AttributeMap attributes) {
     for (String attributeName : attributes.getAttributeNames()) {
       Attribute attr = attributes.getAttributeDefinition(attributeName);
       if (!attr.isNonEmpty()) {
@@ -1994,7 +1994,7 @@
 
       boolean isEmpty = false;
       if (attributeValue instanceof SkylarkList) {
-        isEmpty = ((SkylarkList) attributeValue).isEmpty();
+        isEmpty = ((SkylarkList<?>) attributeValue).isEmpty();
       } else if (attributeValue instanceof List<?>) {
         isEmpty = ((List<?>) attributeValue).isEmpty();
       } else if (attributeValue instanceof Map<?, ?>) {