Remove dead code.
Fix error in comment.
Modify way handout settings are triggered to make it possible to combine multiple options.
Initial implementation of margin notes for handout mode.