More fixes for issue 83.  Test 0053 passes.