Minor cleanup and reorg of NotesViewController.m.