Callback update

Minor update how callbacks are called. Now uses so called
variable-functions.