Fix a possible bug when the user messes with us; rmv some test code.