Oh brother. Changing ambiguity resolution over to full explicit row.
This is going to take some time to get right.