This patch series contains some fixes and cleanups, mostlytrivial. The patches are in preparation of the implementation ofsupport for variable data size samples.