Workbook: big pile of rendering cleanups