Switch from dictionary with functions just to the functions.