First pass at cleanup, getting rid of the globals.

Still have some from the new/mail/help reader, but I'm starting to get a
bit drunk so should stop here while stuff is still working.