DRY-ing out, part 2