Further fixes to javascript multiple class handling.