M7: M7Perm -> M7Per
E22:
The point at the M7 / M7Per junction is labeled M7Ufa, but there's no M7Ufa in the HB.
Less sure what to call this. E017's waypoint here is M7. With another branch of M7 beginning and leaving there, that's more clearly legit...
M7/M7Per?
M7_E?
M7_Ufa with an underscore?
