[#39] Adapted WHERE clause generator to handle numbered slots.