Cut out almost all the optional code paths, drastically simplifying the