Change callbacks from quoted code to procedures