Fix some minor issues with r194282 to get the tree healthy again.