Fix https://github.com/julianhyde/optiq/issues/119, "Comparing Java type long with SQL type INTEGER gives wrong answer".
Clean up maps and other static data.