Oh, it helps to also commit the change that improves the error messages.