Cleanup

* close a timing window
* use Ifrit Invoke instead of Envoke

Signed-off-by: Michael Fraenkel <fraenkel@us.ibm.com>