Syntax changes and minor tweaks to structured.js.