SI-7622 Scaladoc and error message polish

Restores the verbiage "run right after".