proper context handling for expressions