Split up restart manipulation functions and do some renaming.