Convert more of dnolen's CLJS code