Further work on pre-release (I hope) cleanup