Simplify the FUNCTION macro. Update cpg.