Cleanup for code style. No API changes.