Minor clean-up changes.