Modify helper to be even more DRY

Finally saw what mislav was saying :P