Switched the use of passenger & context for consistency with the metaphors in use.