Adjust the errors and the usages to be more expressive.