Some more updates for the changes to the execution context predicates