Change pj-mapc(ar) into functions instead of macros