Moved variables to their own stanza.