OK, do you take care that the changes I did here get preserved in the no-inline-js branch.