Fix value rewrite from unprefixed to prefixed declaration