Markup adjustments; fix the names of modules referenced in an expression.

Deprecated Random.cunifvariate clearing bug 506647.