Checkpoint

InvalidDataException diagnostics much improved. Just 15 cases left to
resolve.