Brought code up to date with BEAST 2.1.1 API.