Review-Round3: Pullout the context variables.