-Cleanup: mark some tables const