DRY up changes; h/t sloria.