remove @expr, @pat, @decl: useless indirection