Miscellaneous cleanup around info schema rewrite - mostly collapsing
some classes together and getting rid of unused methods.

Also, implement engine side of 1390 (planner side was done a while ago).
You can lead a horse to water, but you can't make him drink.