Followup 100905, fixing usages of getContext()