Some modifications to sync up with the SVN.
Commits to get dependencies on new MBAR refactoring working.