More steps towards sane location assignment in Fog. Not quite there yet; still broken.