semantic: Rework ExpReference rewriting