More sensible restart routine: `_reinit' functions replaced by `_end' and