Make definitions always point to functions