Make cleanup function take optional arg for setup function result