Some codebase clean-up.