Currently, those sections are specific to variable definitions, but need to be extended to all three types of definitions.
A few extra sentences achieved this without another major reorganization.