Some more tweaks to two-phase docs formatting