Started generalising the primitives to arbitrary contexts.