Topic/repository builder minor cleanup

I'm not even sure if this is an improvement or not. It's probably not even close to where we want, but it does remove some boilerplate which can't be all bad?

The ChordSpec is still failing due to factset ordering, which I'll fix tomorrow morning.

/cc @markhibberd @raronson