Restructure: Don't redefine a function.