Make definition forms toplevel forms, and separate out the EXPORT.