A few more places to rename context to context_fact