Refactor city... flatmsg.c is now the test harness.