Simplify the FUNCTION macro. Update for cpg.