Adapt calling sites too.

When data comes from the user, it is good to check that
what we read is correct and warn the user if it's not.