More refactoring of client-side js compilation