diff --git a/protocol/protocol.tex b/protocol/protocol.tex
index 939184aa..c66eec15 100644
--- a/protocol/protocol.tex
+++ b/protocol/protocol.tex
@@ -2021,21 +2021,23 @@ electronic commerce and payment, financial privacy, proof of work, zero knowledg
 \newcommand{\blossomonwarditem}[1]{\blossom{\item {[\Blossom onward]}\, {#1}}}
 \newcommand{\presaplingitem}[1]{\item \presapling{#1}}
 \newcommand{\saplingonwarditem}[1]{\sapling{\item {[\Sapling onward]}\, {#1}}}
+\newcommand{\saplingandblossomitem}[1]{\sapling{\item \saplingandblossom{#1}}}
 \newcommand{\preoverwinteritem}[1]{\item \preoverwinter{#1}}
-\newcommand{\overwinteronlyitem}[1]{\overwinter{\item {[\Overwinter only, pre-\Sapling\!]}\, {#1}}}
+\newcommand{\overwinteronlyitem}[1]{\overwinter{\item {[\Overwinter only, \sapling{pre-\Sapling}]}\, {#1}}}
 \newcommand{\overwinteronwarditem}[1]{\overwinter{\item {[\Overwinter onward]}\, {#1}}}
 \newcommand{\sproutspecificitem}[1]{\item \sproutspecific{#1}}
 
 \newcommand{\prenufour}[1]{\notbeforenufour{\nufour{[Pre-\Nufour\!]\,}} {#1}}
 \newcommand{\nufouronward}[1]{\nufour{[\Nufour onward]\, {#1}}}
-\newcommand{\preheartwood}[1]{\notbeforeheartwood{[Pre-\Heartwood\!]\,} {#1}}
+\newcommand{\preheartwood}[1]{\notbeforeheartwood{\heartwood{[Pre-\Heartwood\!]\,}} {#1}}
 \newcommand{\heartwoodonward}[1]{\heartwood{[\Heartwood onward]\, {#1}}}
-\newcommand{\preblossom}[1]{\notbeforeblossom{[Pre-\Blossom\!]\,} {#1}}
+\newcommand{\preblossom}[1]{\notbeforeblossom{\blossom{[Pre-\Blossom\!]\,}} {#1}}
 \newcommand{\blossomonward}[1]{\blossom{[\Blossom onward]\, {#1}}}
-\newcommand{\presapling}[1]{\notsprout{[Pre-\Sapling\!]\,} {#1}}
+\newcommand{\presapling}[1]{\notsprout{\sapling{[Pre-\Sapling\!]\,}} {#1}}
 \newcommand{\saplingonward}[1]{\sapling{[\Sapling onward]\, {#1}}}
-\newcommand{\preoverwinter}[1]{\notsprout{[Pre-\Overwinter\!]\,} {#1}}
-\newcommand{\overwinteronly}[1]{\overwinter{[\Overwinter only, pre-\Sapling\!]\, {#1}}}
+\newcommand{\saplingandblossom}[1]{\sapling{[\Sapling and \Blossom only, \heartwood{pre-\Heartwood}]\,} {#1}}
+\newcommand{\preoverwinter}[1]{\notsprout{\overwinter{[Pre-\Overwinter\!]\,}} {#1}}
+\newcommand{\overwinteronly}[1]{\overwinter{[\Overwinter only, \sapling{pre-\Sapling}]\, {#1}}}
 \newcommand{\overwinteronward}[1]{\overwinter{[\Overwinter onward]\, {#1}}}
 \newcommand{\sproutspecific}[1]{\notsprout{[\Sprout\!]\,} {#1}}
 
@@ -2048,10 +2050,10 @@ electronic commerce and payment, financial privacy, proof of work, zero knowledg
 \newenvironment{nnotes}{\introlist\callout{}{Non-normative notes:}\begin{itemize}}{\end{itemize}}
 
 \newcommand{\prenufourpnote}[1]{\callout{\notbeforenufour{\nufour{[Pre-\Nufour\!]\,\,}}}{Note:}{#1}}
-\newcommand{\preheartwoodpnote}[1]{\callout{\notsprout{[Pre-\Heartwood\!]\,\,}}{Note:}{#1}}
-\newcommand{\presaplingpnote}[1]{\callout{\notsprout{[Pre-\Sapling\!]\,\,}}{Note:}{#1}}
-\newcommand{\preoverwinterpnote}[1]{\callout{\notsprout{[Pre-\Overwinter\!]\,\,}}{Note:}{#1}}
-\newcommand{\overwinteronlypnote}[1]{\callout{\overwinter{[\Overwinter only, pre-\Sapling\!]\,\,}}{Note:}{#1}}
+\newcommand{\preheartwoodpnote}[1]{\callout{\notbeforeheartwood{\heartwood{[Pre-\Heartwood\!]\,\,}}}{Note:}{#1}}
+\newcommand{\presaplingpnote}[1]{\callout{\notsprout{\sapling{[Pre-\Sapling\!]\,\,}}}{Note:}{#1}}
+\newcommand{\preoverwinterpnote}[1]{\callout{\notsprout{\overwinter{[Pre-\Overwinter\!]\,\,}}}{Note:}{#1}}
+\newcommand{\overwinteronlypnote}[1]{\callout{\overwinter{[\Overwinter only, \sapling{pre-\Sapling}]\,\,}}{Note:}{#1}}
 \newcommand{\overwinteronwardpnote}[1]{\callout{\overwinter{[\Overwinter onward]\,\,}}{Note:}{#1}}
 \newcommand{\sproutspecificpnote}[1]{\callout{\notsprout{[\Sprout\!]\,\,}}{Note:}{#1}}