Remove convoluted keyword argument processing in RESTART-CASE