No-js tweaks

Apply a few small tweaks to clean up the no javascript interface.  This is
far from perfect but is an incremental improvement over the existing no
javascript version.

Bug: 58019
Change-Id: Ib408f1da3827027fe685e371f12711e3941b7021
Merge "No-js tweaks"