Restore strongly typed expect mode field
Minor documentation tweak