Got rid of the constant boxing - unboxing when working out the int values in the RawRowBasedTableDataSource - thinking about it, the mutable wrapper isn't needed so will change to a immutable one