More clean-up.
Bug fix.