Cleanup TableScanOperator imports.

This also gets it to compile...