Use -[substring{To,From}Index:] in more places