diff --git a/crates/hir-expand/src/proc_macro.rs b/crates/hir-expand/src/proc_macro.rs
index dc04a41155d..c9539210abf 100644
--- a/crates/hir-expand/src/proc_macro.rs
+++ b/crates/hir-expand/src/proc_macro.rs
@@ -7,20 +7,23 @@
 
 #[derive(Debug, Clone, Copy, Eq, PartialEq, Hash)]
 pub struct ProcMacroExpander {
-    proc_macro_id: Option<ProcMacroId>,
+    proc_macro_id: ProcMacroId,
 }
 
+const DUMMY_ID: u32 = !0;
+
 impl ProcMacroExpander {
     pub fn new(proc_macro_id: ProcMacroId) -> Self {
-        Self { proc_macro_id: Some(proc_macro_id) }
+        assert_ne!(proc_macro_id.0, DUMMY_ID);
+        Self { proc_macro_id }
     }
 
     pub fn dummy() -> Self {
-        Self { proc_macro_id: None }
+        Self { proc_macro_id: ProcMacroId(DUMMY_ID) }
     }
 
     pub fn is_dummy(&self) -> bool {
-        self.proc_macro_id.is_none()
+        self.proc_macro_id.0 == DUMMY_ID
     }
 
     pub fn expand(
@@ -32,7 +35,10 @@ pub fn expand(
         attr_arg: Option<&tt::Subtree>,
     ) -> ExpandResult<tt::Subtree> {
         match self.proc_macro_id {
-            Some(id) => {
+            ProcMacroId(DUMMY_ID) => {
+                ExpandResult::new(tt::Subtree::empty(), ExpandError::UnresolvedProcMacro(def_crate))
+            }
+            ProcMacroId(id) => {
                 let proc_macros = db.proc_macros();
                 let proc_macros = match proc_macros.get(&def_crate) {
                     Some(Ok(proc_macros)) => proc_macros,
@@ -44,13 +50,13 @@ pub fn expand(
                         );
                     }
                 };
-                let proc_macro = match proc_macros.get(id.0 as usize) {
+                let proc_macro = match proc_macros.get(id as usize) {
                     Some(proc_macro) => proc_macro,
                     None => {
                         never!(
                             "Proc macro index out of bounds: the length is {} but the index is {}",
                             proc_macros.len(),
-                            id.0
+                            id
                         );
                         return ExpandResult::new(
                             tt::Subtree::empty(),
@@ -81,9 +87,6 @@ pub fn expand(
                     },
                 }
             }
-            None => {
-                ExpandResult::new(tt::Subtree::empty(), ExpandError::UnresolvedProcMacro(def_crate))
-            }
         }
     }
 }
diff --git a/crates/hir/src/symbols.rs b/crates/hir/src/symbols.rs
index 4eaf99e3e73..af37206eadc 100644
--- a/crates/hir/src/symbols.rs
+++ b/crates/hir/src/symbols.rs
@@ -50,7 +50,7 @@ pub fn original_range(&self, db: &dyn HirDatabase) -> FileRange {
     pub fn original_name_range(&self, db: &dyn HirDatabase) -> Option<FileRange> {
         if let Some(file_id) = self.hir_file_id.file_id() {
             // fast path to prevent parsing
-            return Some(FileRange { file_id, range: self.ptr.text_range() });
+            return Some(FileRange { file_id, range: self.name_ptr.text_range() });
         }
         let node = resolve_node(db, self.hir_file_id, &self.name_ptr);
         node.as_ref().original_file_range_opt(db.upcast())