song2: stick: Minor improvements to stanzas.