Replaced string representations of Group and Users with variables

Also, ensured that the "Require" lines include adding the group and user
resources where cited as owner or group.

Apologies for the whitespace tweaks - the editor I'm using added them for me. I cherry-picked them out before committing in most cases, but appear to have missed some. Sorry!