More skylark function cleanups

--
MOS_MIGRATED_REVID=91407816
diff --git a/src/main/java/com/google/devtools/build/lib/rules/SkylarkRuleClassFunctions.java b/src/main/java/com/google/devtools/build/lib/rules/SkylarkRuleClassFunctions.java
index 071185c..9f5b6be 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/SkylarkRuleClassFunctions.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/SkylarkRuleClassFunctions.java
@@ -212,7 +212,8 @@
   private static final SkylarkFunction rule = new SkylarkFunction("rule") {
 
         @Override
-        @SuppressWarnings("rawtypes")
+        @SuppressWarnings({"rawtypes", "unchecked"}) // castMap produces
+        // an Attribute.Builder instead of a Attribute.Builder<?> but it's OK.
         public Object call(Map<String, Object> arguments, FuncallExpression ast,
             Environment funcallEnv) throws EvalException, ConversionException {
           final Location loc = ast.getLocation();
@@ -282,6 +283,8 @@
       this.type = type;
     }
 
+    @SuppressWarnings("unchecked") // the magic hidden $pkg_context variable is guaranteed
+    // to be a PackageContext
     @Override
     public Object call(List<Object> args, Map<String, Object> kwargs, FuncallExpression ast,
         Environment env) throws EvalException, InterruptedException {
@@ -363,9 +366,9 @@
     @Override
     public Object call(Map<String, Object> arguments, Location loc) throws EvalException,
         ConversionException {
-      ClassObject object = (ClassObject) arguments.get("self");
+      ClassObject self = (ClassObject) arguments.get("self");
       StringBuilder sb = new StringBuilder();
-      printTextMessage(object, sb, 0, loc);
+      printTextMessage(self, sb, 0, loc);
       return sb.toString();
     }