a bit of cleanup in the interpreter