Even a little more DRY