Convert usage to use const versions of containers