Touch more code clean-up.