Code cleanup after integrating to closed-source project with its own conventions.
More cleanup.