[FOLD] shared_handler tidying, more work