Better support for remembering context for a request. Cleaned up code.