Switch from FnOnce to proc for now