diff --git a/clang/lib/Analysis/BasicStore.cpp b/clang/lib/Analysis/BasicStore.cpp
index cb6fcab3805d..28a5b98fc4ed 100644
--- a/clang/lib/Analysis/BasicStore.cpp
+++ b/clang/lib/Analysis/BasicStore.cpp
@@ -239,7 +239,7 @@ SVal BasicStoreManager::getLValueElement(const GRState* St, SVal Base,
       // FIXME: Should we have symbolic regions be typed or typeless?
       //  Here we assume that these regions are typeless, even though the
       //  symbol is typed.
-      SymbolRef Sym = cast<loc::SymbolVal>(&BaseL)->getSymbol();
+      SymbolRef Sym = BaseL.getAsSymbol();
       // Create a region to represent this symbol.
       // FIXME: In the future we may just use symbolic regions instead of
       //  SymbolVals to reason about symbolic memory chunks.
diff --git a/clang/lib/Analysis/BugReporter.cpp b/clang/lib/Analysis/BugReporter.cpp
index a240062ef719..36515870b8eb 100644
--- a/clang/lib/Analysis/BugReporter.cpp
+++ b/clang/lib/Analysis/BugReporter.cpp
@@ -635,17 +635,12 @@ public:
   
   bool HandleBinding(StoreManager& SMgr, Store store,
                      const MemRegion* R, SVal V) {
-    SymbolRef ScanSym = 0;
-  
-    if (loc::SymbolVal* SV = dyn_cast<loc::SymbolVal>(&V))
-      ScanSym = SV->getSymbol();
-    else if (nonloc::SymbolVal* SV = dyn_cast<nonloc::SymbolVal>(&V))
-      ScanSym = SV->getSymbol();
-    else
+
+    SymbolRef ScanSym = V.getAsSymbol();
+
+    if (!ScanSym)
       return true;
   
-    assert (ScanSym);
-  
     if (!BR.isNotable(ScanSym))
       return true;
   
diff --git a/clang/lib/Analysis/CheckNSError.cpp b/clang/lib/Analysis/CheckNSError.cpp
index a35497a6bfd8..ff9da0f659c3 100644
--- a/clang/lib/Analysis/CheckNSError.cpp
+++ b/clang/lib/Analysis/CheckNSError.cpp
@@ -194,11 +194,11 @@ void NSErrorCheck::CheckParamDeref(VarDecl* Param, GRStateRef rootState,
   assert (ParamR && "Parameters always have VarRegions.");
   SVal ParamSVal = rootState.GetSVal(ParamR);
   
-
   // FIXME: For now assume that ParamSVal is symbolic.  We need to generalize
   // this later.
-  loc::SymbolVal* SV = dyn_cast<loc::SymbolVal>(&ParamSVal);
-  if (!SV) return;
+  SymbolRef ParamSym = ParamSVal.getAsLocSymbol();
+  if (!ParamSym)
+    return;
   
   // Iterate over the implicit-null dereferences.
   for (GRExprEngine::null_deref_iterator I=Eng.implicit_null_derefs_begin(),
@@ -206,13 +206,11 @@ void NSErrorCheck::CheckParamDeref(VarDecl* Param, GRStateRef rootState,
     
     GRStateRef state = GRStateRef((*I)->getState(), Eng.getStateManager());
     const SVal* X = state.get<GRState::NullDerefTag>();    
-    const loc::SymbolVal* SVX = dyn_cast_or_null<loc::SymbolVal>(X);
-    if (!SVX || SVX->getSymbol() != SV->getSymbol()) continue;
+
+    if (!X || X->getAsSymbol() != ParamSym)
+      continue;
 
     // Emit an error.
-
-    
-
     std::string sbuf;
     llvm::raw_string_ostream os(sbuf);
       os << "Potential null dereference.  According to coding standards ";