Consts cleanup.