unbreaks & DRYs my previous change.