Merge "Make all class redefinition operations after suspend_all infallible"