Fixes to get Composable.Spec.merge to work correctly. Tweak error handling.