I think it's fine to remove the helper function fallback. Still would like to see the other two encapsulated if they're literally the same code (I just have a visceral reaction to duplication of more than a couple of lines :))