Cleaned up a bunch of boost::container* variables and turned them into typedefs for more readability