BF Replace unsafe iterators with lists

Cherry-picked off of @Konubinix's commits:
18b8553
d39d9e1
7da8dc5