js->clj upgrades