Clean up exceptions list and add comments.