Instead of querying the Export table *twice* in export_tools.should_create_new_export(), use the new definition of Export.exports_outdated(), even though that too is really ugly: Export.exports_outdated() should *not* be a classmethod of Export, but sticking to incremental changes for now.