Convert to newest closure compiler