Changes to make typesetter standalone.