This is probably the least-disruption approach we can reasonably manage. Also fix formatting in nested list.