Some clean-ups in code.