Keep it DRY, amend a902212