Refactor the ways code a bit
We used to use a list lookup that couldn't fail. Now we just use functions. There were 3 overlapping entries for WayPar; I've commented out the ones that were shadowed for now.
Showing with 118 additions and 117 deletions