Finally insert the implicit 'AND's correctly