Round 2 of the SQL cleanup.