Finished Ribbit IV Stage 2 of WaypointPlus wrapper

All nodes in Ribbit IV should now be able to be converted from
enumerator form back into waypoint form