Mark up environment variables

(This is a specific subset of the mixed changes in #403.)