Improved context handling, to allow elements out of context.