Merge last few days of RequestHandler refactoring with progress on master.