Ready, I'm going to commit all four at once. Some confusion about indent...

...s and stanza structure, but I doubt it's a relevant problem.