Rename get_context -> update_context. Plus other minor cleanup.