Beta 6: Modest clean-up.