General cleanup and RequestContext-ification, as per code review.

Change-Id: I61f721796ff6bff7f0946ef79e10dd66c0adddb9