Even more DRYness