Context parser: minor changes