changes to handle pick macro transparently (undefine it in same source file where it is defined)