Make the optional verification step more strict.