Make Building adjacency more sane

No changes in the output mesh from this, but it will make it easier to
fix the ATPATH joins.