diff --git a/include/llvm/IR/Attributes.h b/include/llvm/IR/Attributes.h
index 49ef884b702..63fd4fb1edc 100644
--- a/include/llvm/IR/Attributes.h
+++ b/include/llvm/IR/Attributes.h
@@ -159,9 +159,6 @@ public:
   void Profile(FoldingSetNodeID &ID) const {
     ID.AddPointer(pImpl);
   }
-
-  // FIXME: Remove this.
-  uint64_t Raw() const;
 };
 
 //===----------------------------------------------------------------------===//
@@ -272,8 +269,8 @@ public:
 
   typedef ArrayRef<Attribute>::iterator iterator;
 
-  iterator begin(unsigned Idx);
-  iterator end(unsigned Idx);
+  iterator begin(unsigned Idx) const;
+  iterator end(unsigned Idx) const;
 
   /// operator==/!= - Provide equality predicates.
   bool operator==(const AttributeSet &RHS) const {
diff --git a/lib/IR/AttributeImpl.h b/lib/IR/AttributeImpl.h
index e9525785a20..2eb7f075e32 100644
--- a/lib/IR/AttributeImpl.h
+++ b/lib/IR/AttributeImpl.h
@@ -77,8 +77,7 @@ public:
       ID.AddPointer(Vals[I]);
   }
 
-  // FIXME: Remove these!
-  uint64_t Raw() const;
+  // FIXME: Remove this!
   static uint64_t getAttrMask(Attribute::AttrKind Val);
 };
 
diff --git a/lib/IR/Attributes.cpp b/lib/IR/Attributes.cpp
index 01e0235b576..68b831d554d 100644
--- a/lib/IR/Attributes.cpp
+++ b/lib/IR/Attributes.cpp
@@ -223,10 +223,6 @@ bool Attribute::operator<(Attribute A) const {
   return *pImpl < *A.pImpl;
 }
 
-uint64_t Attribute::Raw() const {
-  return pImpl ? pImpl->Raw() : 0;
-}
-
 //===----------------------------------------------------------------------===//
 // AttributeImpl Definition
 //===----------------------------------------------------------------------===//
@@ -308,11 +304,6 @@ bool AttributeImpl::operator<(const AttributeImpl &AI) const {
   return ThisCDA->getAsString() < ThatCDA->getAsString();
 }
 
-uint64_t AttributeImpl::Raw() const {
-  // FIXME: Remove this.
-  return cast<ConstantInt>(Kind)->getZExtValue();
-}
-
 uint64_t AttributeImpl::getAttrMask(Attribute::AttrKind Val) {
   // FIXME: Remove this.
   switch (Val) {
@@ -740,13 +731,13 @@ AttributeSetNode *AttributeSet::getAttributes(unsigned Idx) const {
   return 0;
 }
 
-AttributeSet::iterator AttributeSet::begin(unsigned Idx) {
+AttributeSet::iterator AttributeSet::begin(unsigned Idx) const {
   if (!pImpl)
     return ArrayRef<Attribute>().begin();
   return pImpl->begin(Idx);
 }
 
-AttributeSet::iterator AttributeSet::end(unsigned Idx) {
+AttributeSet::iterator AttributeSet::end(unsigned Idx) const {
   if (!pImpl)
     return ArrayRef<Attribute>().end();
   return pImpl->end(Idx);