Make the lib do more tedious checks.