Status.c post-merge fixes for Jumbo.