Conventions cleanup.