This area needs to be cleaned up. I'm planning to get to it, but I'm just putting a note here for reference/history sake. see https://www.openstreetmap.org/changeset/102259713 for some preliminary fixme's