Finished migrating to the waypoint-cont-base protected virtuals.