refactor graphite stanzas for readability

this refactors the graphite stanzas to something that's more
readable, and makes it simpler to add new ones later without
lots of copy / paste.

Change-Id: I077d54ce885ba3bbcc0ceca4f05959f508a88e96