remove qualified names in macro (again)