Clean up control flow section and move exceptions to the end of the records chapter