I think that looks like a nice enough package, but it probably doesn't need to become part of this (already rather large) PR. By all means let's replace these with standalone templates and use `brfs`, but let's do so when we're back on master.