Some more JS codegen work