Use implicit safe indexing in more places
3 files changed