cljs/skyport.core: Move some code around