Some clean-up. (E. Futo)