Audit and organize GWT module def.

Additional small changes for GWT compatibility.