More work on JS rewrite