Tidy up cljs code sharing/generation