Pre-code style cleanup.