Handle function definitions better.