Fix and simplify how closure compiler runs our js