Yup, getting rid of all the definitions for "func", so that we can restore the master.lib macro with the same name.