Replace 'context' (deprecated) with 'xcontext'