TIMOB-14504 Fix argument wrangling in close and give proper arguments in _restart
TIMOB-14504: Use older style declaration.
Merge pull request #4482 from BlainHamon/timob-14504

TIMOB-14504 Fix argument wrangling in close and give proper arguments in _restart