Last changes before conversion to easel.js.