Avoid remarking city tiles repeatedly during loading.  Reset city borders when appropriate.  Fix nasty bug induced by use of the FOR macro, which is defective under optimization.
Remove debugging code inserted during last commit; we appear to have fixed the bug...