Minor refactoring in try_index_step
Minor refactoring in try_index_step

Merges `if-let` and `if x.is_some() { ... }` blocks

aidancully/rust,graydon/rust,aidancully/rust,graydon/rust,graydon/rust,aidancully/rust,aidancully/rust,graydon/rust,aidancully/rust,graydon/rust,graydon/rust,aidancully/rust