Last nit, I promise: `addHelper`. Although this function does a couple of independent things so I am not even sure it should be a function.