Reorganize function definitions so etags finds them.