Merge upstream r825: fix line continuation in whitespace
Perform more checks on the number of tables supplied by user.