make gen-fns opt-in