A lot of random cleanup (especially, about 400 useless lines deleted in test), and an actual fix for SQLDict validator.