DRYing up my previous change