dry up this case / when
Merge pull request #689 from tenderlove/rm_dups

dry up this case / when