Split the Felix.shutdownInternal() method in two to fix some issues Felix noticed in the new shutdown routine; splitting the method helped us avoid some asymmetry.