I took out the toll=yes in changeset 126389263 but left in the toll:lanes=yes|no|no tag which reflects reality (though not sure if it's a proper tag).  OSMAnd and other tools should choose this path once more for toll free routing.  Leaving this in for a few more days to solicit more comments