s: Fix BETWEEN parsing
s: Check for dups in FROM clause