fixes to expression / context getting interface in coordination with saddle changes