Separate variable reference marking from desugaring.