preproc: allow %pop to take an identifier, unify %push/%repl/%pop