Fix #4 by abstracting helpers.